How to avoid code conflicts between developers