resolved issues sprint 51
5 sep resolving conflicts