#254 resolving conflicts