changed color for testing
changed backgroundcolor for testing
merge conflict