Previous merge resolve