commit changes after appling stash on firmware
a
b
after merging and conflic resolve