Fixed 2013 lar-quality merge conflicts