merging marks changes