diff --git a/project.godot b/project.godot
index 3613b5e0..91f4c420 100644
--- a/project.godot
+++ b/project.godot
@@ -118,7 +118,6 @@ _global_script_classes=[ {
 "class": "ESCActionManagerMonkey",
 "language": "GDScript",
 "path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd"
-"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd"
 }, {
 "base": "Resource",
 "class": "ESCAnimationName",
@@ -940,6 +939,7 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
 [editor_plugins]
 
 enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" )
+<<<<<<<HEADenabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" )
 
 [escoria]