merged successfully
now successfully merged
commented version