end of the bad day 03th april
resolve conflict