udpates to avoid conflicts while merging back to master