you can still commit, if i use the latest json to merge later?