added build configurations
conflict resolving