Fixed Merge issues #2