making git notice the merge of this file