Billie Faiers and Greg Shepherd have ended their long-running feud with their neighbours, according to reports.The 30 year old and her 33 year old husband have been caught in a row with locals over their plans to build their dream home in Essex.The Mummy Diaries stars bought a run down £1.4million 1920s property in Brentwood last year, submitting plans to turn it into a five bedroom home to share with their daughter Nelly, six, and three year old son Arthur.