Add some info about resolving conflicts