fixed proper merge