fixed major issues caused by auto-merge