Clean up from merge conflict