fix p4notelte-common merging