Added test cases and implementation
Removed conflicts