GitHub Edit on master of bar for a conflict.