little updates and syncing
changes
fixing conflict