resolve conflict between devel and puppetmaster