committing changes from meeting
fixing merge issues