Committing meta file to make git happy
Merge conflict fix hopefully.