resolve merge issues
comment with a wiki page explaining this workaround