home page about us dynamic
 conflict resolved