Merge beta features
Resolve git conflicted state