resolve issue
after first submission
resolved conflicts