merge consolidation changes to device