first commit
Added merge features