Fix issues with merge conflicts