Merge push

Fixing merge issues.