Fixed Merge issues and conflicts