Fixed post-merge conflicts