shit merge problem