move deps to right locations
fix merge problem