Resolved all the conflicts due to merging