Resolved unsucessful merge