made some fix for some unresolved conflicting files.
slight changes in views. Rider plus style changes on bottom blocks.
resolved luckybuys index.php view conflict.
rider style fix
resolved conflicts