#486 resolving conflicts