Fixed a bug regarding the merge