style change to make merges better