conflicts coming
resolved