dd/mm/yyyy popup
conflicts resolved
place holders deleted