beaglebone: solved merge conflict