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