made git pull with rebase to avoid micro merges