fixing stupid merge problem