FIXED all merge errors