Fixed some mergeness