Resolve branch conflict