Resolving Merge Conflict

Updated to add comments from the original config_build.txt