- Fixed conflicts' errors