got rid of last merging issues