adding automerging of etc