trying to merge changes
fixing merge conflict
fixed various errors