Removed few conflicts