code formating and conflict resolving
Fix modal styling issue