syncing dev and main