added backup before merging 2 branches