fixed faults while merging