Merge issues
Merged ex.in
Fix conflict - ex.in