Finished resolving merge problems