Avoid build conflicts in build server