Fixed weird merge problem again