Handled merge confilct