some more literal stuff
 resolving conflicts