fix issues after merging