#44: committing for backup
#44: committing for backup
fixing merge conflicts