Handeled last merge conflict