Actually resolve conflict with revertion