fixed merge conflicts properly this time