conflict from main directory?
conflicts resolved